Resolve upstream updates to referenced crates

diff --cc Cargo.lock
index ca1ac023ffd0b630f380e129ab151af6c3730667,a0a097ba21bb0470eae0a96d9ebcf1bedc396dc9..c0d530e2f14641718b34b893ec6fdd3e0ff8ec36
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -9,8 -9,7 +9,8 @@@ dependencies = 
   "crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)",
   "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
   "docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-  "env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+  "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
 + "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
   "filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
   "flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)",
   "fs2 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@@ -66,29 -65,6 +66,29 @@@ dependencies = 
   "memchr 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
-  "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
 +[[package]]
 +name = "backtrace"
 +version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "backtrace-sys 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 + "cfg-if 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
-  "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 + "rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
 + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
 +[[package]]
 +name = "backtrace-sys"
 +version = "0.1.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "gcc 0.3.49 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "bitflags"
  version = "0.7.0"
@@@ -145,10 -121,9 +145,10 @@@ name = "crates-io
  version = "0.9.0"
  dependencies = [
   "curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_derive 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
-  "serde_json 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 + "error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
   "url 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
@@@ -209,21 -175,13 +209,21 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "env_logger"
- version = "0.4.2"
+ version = "0.4.3"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  dependencies = [
-  "log 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
-  "regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+  "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
+  "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
 +[[package]]
 +name = "error-chain"
 +version = "0.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +dependencies = [
 + "backtrace 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
 +]
 +
  [[package]]
  name = "filetime"
  version = "0.1.10"
@@@ -598,14 -556,9 +598,14 @@@ source = "registry+https://github.com/r
  
  [[package]]
  name = "regex-syntax"
- version = "0.4.0"
+ version = "0.4.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
  
 +[[package]]
 +name = "rustc-demangle"
 +version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +
  [[package]]
  name = "rustc-serialize"
  version = "0.3.24"
@@@ -856,11 -808,9 +857,11 @@@ dependencies = 
  "checksum crossbeam 0.2.10 (registry+https://github.com/rust-lang/crates.io-index)" = "0c5ea215664ca264da8a9d9c3be80d2eaf30923c259d03e870388eb927508f97"
  "checksum curl 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c90e1240ef340dd4027ade439e5c7c2064dd9dc652682117bd50d1486a3add7b"
  "checksum curl-sys 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "23e7e544dc5e1ba42c4a4a678bd47985e84b9c3f4d3404c29700622a029db9c3"
 +"checksum dbghelp-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "97590ba53bcb8ac28279161ca943a924d1fd4a8fb3fa63302591647c4fc5b850"
  "checksum docopt 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ab32ea6e284d87987066f21a9e809a73c14720571ef34516f0890b3d355ccfd8"
  "checksum dtoa 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "80c8b71fd71146990a9742fc06dcbbde19161a267e0ad4e572c35162f4578c90"
- "checksum env_logger 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e3856f1697098606fc6cb97a93de88ca3f3bc35bb878c725920e6e82ecf05e83"
+ "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
 +"checksum error-chain 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d9435d864e017c3c6afeac1654189b06cdb491cf2ff73dbf0d73b0f292f42ff8"
  "checksum filetime 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "5363ab8e4139b8568a6237db5248646e5a8a2f89bd5ccb02092182b11fd3e922"
  "checksum flate2 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "36df0166e856739905cd3d7e0b210fe818592211a008862599845e012d8d304c"
  "checksum foreign-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e4056b9bd47f8ac5ba12be771f77a0dae796d1bbaaf5fd0b9c2d38b69b8a29d"
@@@ -902,18 -852,17 +903,18 @@@
  "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
  "checksum rand 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "022e0636ec2519ddae48154b028864bdce4eaf7d35226ab8e65c611be97b189d"
  "checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
- "checksum regex 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4278c17d0f6d62dfef0ab00028feb45bd7d2102843f80763474eeb1be8a10c01"
+ "checksum regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1731164734096285ec2a5ec7fea5248ae2f5485b3feeb0115af4fda2183b2d1b"
  "checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
- "checksum regex-syntax 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9191b1f57603095f105d317e375d19b1c9c5c3185ea9633a99a6dcbed04457"
+ "checksum regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad890a5eef7953f55427c50575c680c42841653abd2b028b68cd223d157f62db"
 +"checksum rustc-demangle 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3058a43ada2c2d0b92b3ae38007a2d0fa5e9db971be260e0171408a4ff471c95"
  "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
- "checksum semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a3186ec9e65071a2095434b1f5bb24838d4e8e130f584c790f6033c79943537"
+ "checksum semver 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3fdd61b85a0fa777f7fb7c454b9189b2941b110d1385ce84d7f76efdf1606a85"
  "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
- "checksum serde 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1be24992f20bb7dfb9932a152a6f51ed7f756ebd8df1ea707ecab09d615d3ede"
- "checksum serde_derive 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "94f3c3fd5cd27ffda6e1f330daed369d087b50557d59bd19c230c893f4fced60"
- "checksum serde_derive_internals 0.15.0 (registry+https://github.com/rust-lang/crates.io-index)" = "021c338d22c7e30f957a6ab7e388cb6098499dda9fd4ba1661ee074ca7a180d1"
+ "checksum serde 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "c2f530d36fb84ec48fb7146936881f026cdbf4892028835fd9398475f82c1bb4"
+ "checksum serde_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "10552fad5500771f3902d0c5ba187c5881942b811b7ba0d8fbbfbf84d80806d3"
+ "checksum serde_derive_internals 0.15.1 (registry+https://github.com/rust-lang/crates.io-index)" = "37aee4e0da52d801acfbc0cc219eb1eda7142112339726e427926a6f6ee65d3a"
  "checksum serde_ignored 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c10e798e4405d7dcec3658989e35ee6706f730a9ed7c1184d5ebd84317e82f46"
- "checksum serde_json 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e9b1ec939469a124b27e208106550c38358ed4334d2b1b5b3825bc1ee37d946a"
+ "checksum serde_json 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "48b04779552e92037212c3615370f6bd57a40ebba7f20e554ff9f55e41a69a7b"
  "checksum shell-escape 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5cc96481d54583947bfe88bf30c23d53f883c6cd0145368b69989d97b84ef8"
  "checksum strsim 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d15c810519a91cf877e7e36e63fe068815c678181439f2f29e2562147c3694"
  "checksum syn 0.11.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d3b891b9015c88c576343b9b3e41c2c11a51c219ef067b264bd9c8aa9b441dad"

diff --cc Cargo.toml
Simple merge

diff --cc src/cargo/util/toml.rs
index d10eccdf16f747700e6164de4a028c9d63ab8588,5ffa4acff897365aa0e9e7ca5ceb90c9151e4102..02c5e5eaefc46b5e3dc9d3c559cc99c69be8f556
--- 1/src/cargo/util/toml.rs
--- 2/src/cargo/util/toml.rs
+++ b/src/cargo/util/toml.rs
@@@ -18,8 -18,7 +18,8 @@@ use core::dependency::{Kind, Platform}
  use core::manifest::{LibKind, Profile, ManifestMetadata};
  use ops::is_bad_artifact_name;
  use sources::CRATES_IO;
- use util::{self, ToUrl, ToSemver, Config};
 -use util::{self, CargoResult, human, ToUrl, ChainError, Config};
++use util::{self, ToUrl, Config};
 +use util::errors::{CargoError, CargoResult, CargoResultExt};
  
  /// Representation of the projects file layout.
  ///